Fixed errors introduced by Rick.