fixes
fixed original data add/remove problem