fixes #172 fixes #173