Release 1.25: Bugfix for pull request #23.