Missed a bit in that embarassing bugfix. Really need tests, will have to wait till the weekend.