measure fixes