more toward #105; need to fix earlier versions as well