EPIC FAIL fix