Fixed Issue #1121 

 Fixed Issue #1121