simplified bugfixes