Fix for #411
Merge pull request #417 from akvo/annamarthe-411

Fix for #411, looks fine