Fixed bug in production