Fixes #5702