fixes #2111

Fixed the issue on master-2.2.1

Please Check.