Fixes #5499