Fix a bug introduced in the previous commit.
Merge branch 'release/v0.2.1' into develop.