Trying to get rid of this stupid bug