Fix NHS claims problem at the source