fixes #184 , #197