fix Issue #48 Issue #47