Fix field removing and swapping