kmathern's fix