Bug fix for production