Tweak Dave's fix for consistency