Entertainment 1.0 Fix