Fixed errors introduced by last commit.
Improvement.