fixes #5004