Mock bug fix