Fixes #112