Z-target bugs out when switching map

Already fixed by !1718 (closed) but that branch is currently on hold because of netcmd issues so I'm documenting this here