more bugfixin