Fixes issue #16. The last commit was insufficient, now the issue is really fixed.