yet more bugfix