Fixed errors in original commit.