fixed alloc error
merge