Stopping bugfixes at a weird place