In the process of fixing the commands thread crashing the form.
Changed current map