Fix to feature 1