generic command fix