fix for Advanced feature