Sorry, didn't compile before commiting :P  NOW OK.