Production hotfix