resolve crud bugs part 1