Merge pull request #655 from jmaas/master

Small fix for #654, reported by Jeus de Baldoma.