fixes #5526