fix command handler