fix staging as well as production