Fixed #112