Fix #123
Merge pull request #124 from Ephemera/fix-overlay

Fix #123