fix command handling
fix command handling