fixes #64
better fix for #64