trying to fix Issue #59