[Fix] Issue #448