Fix for issue #32

I am not sure it fixes it - we need confirmation