Fixes #4673