Tweak @koresar's fix for #13