Pending bug fix and production mode