bugfix
refactoring