Fixes #198, fixes #197