first commit in bugfixes branch