another fix
hopefully final fix