Made fibs-until more functional