Fixed bug where current player was incorrectly set