Bug fix phase 2 done