ivicanikolicsg fixed issues