Fixing production issue