Fix feature_flag