fixing only_if