more bugfix