ref#194 fixes