Fixed Issue #112