Fixing an epic fail