Non dependant dependencies fix