Addresing bug fixed