Fixes #203