fixed master bug