Until is now correctly interpreted