Attempt to fix issue #211