Fixed  Issue #1218 

Fixed  Issue #1218