Fix Eremo
Merge pull request #1363 from Skillert/minor

Fix Eremo