Fixed badly merged pull request