Fixed errors from the last pull request

Fixed the fix