Fix for measurements