[master] fixed bugs