Fixed problem from last commit