fix bug for prod and prepare for deploy