Testing: bugfixes to previous again