Fixing a huge bug in production