Fixed errors introduced in previous commit