Fixed empty and readd bug