fix command and map