fix all method for production