Added condition for measures