A small fix for the previous commit
Merge pull request #1187 from ussuri/small-fixes

A small fix for the previous commit