fixes #183 fixes #184