Fixes #4708