Fixed issue #856

Fixed issue #856