addresses #9991, #9958