Fix to merge from master branch