fixed solved v2