Trying to fix a weird bug