More on #38 - Fix #43