- fixed #1 - while reproducing the bug I actually got other exceptions, but the fix should do anyway