Fix removing field bug