Fixes # 4618 : This is a fresh commit to try and fix issue 4618

Fixing issue #4618