Trying to fix an annoying bug (not succeeding).