[!] bug fix done