Fixed the production issuse