fixes #5314