group bugfixes