Fixes #4701