Really fix player states this time