fixes #5349