Override bug fix