EPIC BUG FIX