fix #17 - maybe not the right right way, but better then before