Fixes #206 and fixes #203