Fixed master bug