Added bug fix TODO