The GOP-controlled House is set to vote Tuesday on a month-long extension to the  Federal Aviation Administration (FAA) authorization, setting up what leaders hope is a final resolution to an ugly standoff over the agency.

The House is set to vote on a bill extending FAA’s authorization through February 17, several congressional aides confirmed. The Senate should follow next week, according to Democratic aides. It’ll be the 24th temporary extension for FAA authorization since 2007.

The votes come after Republicans and Democrats reached a deal last week on controversial union organizing rules controlled by the National Mediation Board. The compromise preserves a provision whereby absentee votes count toward a decision to unionize at a company, as Democrats wanted. But, in a concession to Republicans, the compromise increases from 35 to 50 the percentage of workers who would have to vote in favor of unionization in order for a shop to organize.

The NMB labor issues are not the only ones dogging FAA authorization. Issues of rural airline subsidies and overall spending levels are among those that still need to be worked out. If they are, lawmakers hope to vote on a four-year “permanent” FAA authorization in February, according to aides.

Follow Todd Zwillich on Twitter @toddzwillich