Fixing feedback # 2