bugfix
moar bugfix
refactor