Manual change of nbriches pull request. :(