Fixing a production issue