bugfixes for previous update