Trying to fix crazy bug