Fix issue #3712