further fixes to #62
0.5.18