fixes #60 as described there