Included bug fix in master branch