Fixing PR #112 as discussed with Arik