additional fix for feature1