Fix failing feature after dumb merge