Fixed master branch behavior