[Fix] For Issue #1