r329: (tinybit) re-resolved issue 74
r330: fix issue 117