Fixed Issue #1193 

 Fixed Issue #1193