master branch bug fix