Fixed failing feature