[*] bug fixes