trying to fix Issue #59 second