fixes #2111

Fixed this issue on master also..

Please Check.