Fix for #112

Comments are welcome