Yaron's test fix