Follow comments from @johbo