a master bug fix