Fixed Issue #1071 

 Fixed Issue #1071