More of the same bug fix