Fortify ender() logic per #19