Resolved issue #3797