bugfixes to previous commit