Tiny improvement in standard functions used
Merge pull request #1850 from ussuri/small-fixes

Tiny improvement in standard functions used