Fixing player heroes handling