fix general_remakrs