 While you are working on #19 could you also take a look at this, please?
