Fixed Erich’s fix to my previous fix which was broken. Stop the madness.