solved 2
fixed 2