Fixes #5216