Fixing production bug