From @astranchet - see PR #1