Doing the bugfix the right way.