Fixing a bug which I... cough... introduced in 0a34a556....