Merging manuualy from fix branch