fixed the bug in the master branch