Fix Bug related to Production Mode