fix Issue #6 Thanks acliss19xx