Oops - bug in last commit!