Fix bug removing complex fields