* fixed bugs in measurements