Fix empty player - Part 2