Fixed same issue with media expressions