To fixed the  Issue #18 

To fixed the  Issue #18