Fixed errors introduced by last commit