Fixes #5198