bugfixing for remove and add period