Fix a bug in my previous patch, thanks to Jay Foad for