Trying to fix an annoying bug