Master is finally usable again