bug fix for production