Fixed repetion and unmapped command