i have fixed the problem and i hope it's right