fixed segments error
merge