[ENHANCEMENT]Fixed bug in prod build