Tx Tijs for catching amateuristic bugs in last commit