Final fix.
Merge pull request #759 from Heredth/Elvis

Final Elvisblock Fix