fixed abort
bug fixing
merge