Fixed issue #3143
Fixed issue #3142