Fix record removal