If and Until are still broken