Doh, missed something during merging.