Fix issue around player object not been set