Trying to fix issue #131 . Not tested.