Fixed spacing around "until"