Fixed non measurement issue