Fixes #179 fixes #153
Fixes #179 fixes #153