Fix to cater for another bug