Fixes #5299