* fixzed bugs in measurements