addresses #9683