Finally! Last bugfix for the first real test.