Fixes #4384.