fixing some not correctly assigned value