Fix failing feature