[#958] Fixed.
Merge pull request #975 from akvo/bug/974

[#958] Fixed.