Fixes #2 on release branch (master).