Fix for measures