first wrking fix
new fix
new fix