Fixes #924

Comment From: ilayaperumalg

Didn't realise this PR was already there. Closing this as duplicate as it has recently been addressed via d44a6aff7c5d8541b8e51af21b92fd310b16e9a6