fixes #5057