Production-level performance for the bugfix...