Fixed Issue #1234 

 Fixed Issue #1234