Fix issue #3784