Fixed Issue #1235 

 Fixed Issue #1235