Issue344

fixes #344
I think that's how it should work.