Modifying conversion code to resolve #112.