fix for feature 3