Fixed severe production problem