BUG FIXES RELEATED WITH MEASURES