addresses #9993