Fixed error caused by last pull request