Fixes gh-289

Comment From: tzolov

Thank you @ThomasVitale , will review it shortly

Comment From: tzolov

Great job @ThomasVitale ! Rebased and merged at: 41a459a10b42ae891dbeb1242cadff7ee3ea6bb2

Comment From: ThomasVitale

@tzolov thank you!