Fix only_if problem