bugfix + crap