Fix bug with condition initialization