This fix is for issue #4494

This fix is for issue #4494