Fix Epic Fail