Bug fix to my previous commit.