fix #112 cc: @robgur