Fixes #5266