Fixed Issue #1202 

 Fixed Issue #1202