fixed buff erasing issues