Emergency fix
Merge pull request #719 from Heredth/Bleeding-Edge

Emergency fix for ELVISBLOCK