Epic Fix!

Epicness for the win!