Fixed bug arising from merge in last commit.