fix master bug