fixing a very annoying issue