Milki bug fix 3.0