Fixing issue noted by user Upstream-commit: 0780ad4857bb7db1caaf6c4c1d60970d5695c464 Component: engine