Trying to fix Issue #246