[FIX] Cleaning + bug fixing when only measures change