Fix Z measurement estimation