Fixed it partially