Added bug fix