Fixes #6614 : Re-adding fix for this issue.