Fixed Issue #1094 

 Fixed Issue #1094