fixes #5509;