bugfix #2

...other places...