Fix regression introduced in bae432a8, Fixes #550
Merge pull request #551 from maurizi/master

Fix regression introduced in bae432a8, Fixes #550