further bugfix