Any chance to speed up bugfix?