Improved detection of current player