Off by one part 2
Merge branch 'gadget' of https://github.com/ls-cwi/heinz into gadgets