[master] bug fixing