Fixed bug in Production