Fix gamebreaking issue