By-pass pull request #55