fix measure issues