cleanup bugfix