added another more explicit fix for #11