ok, fix of the measurement bug. for real this time