Bugfix EntertainmentHandler