Solution b i fix