Fixes #5008