first pass on fix for #113