Merge Mayhem's QR fix