Fixed Issue #1210 

 Fixed Issue #1210