Fix that weird bug