[master] bug fix