trying to fix Issue #1424