fixes for master #2089

Fixed on master.

Please check.