Fixed  Issue #1278 

Fixed  Issue #1278