added additional fixes, however the player gets still kicked twice.