nasty fix do better