Attempting to fix a weird bug