Bugfix #9

a lot of crap