Fixes #4009