A possible fix for #46

This seems to fix the issue. Not sure it is the right way to go, though…