bugfix left from cleanup