bugfixes (again)