changed the fix to a more simple one