master bug fix