Fix measurement type check