Fixed crash and two commands