Fix it manually if you need to, I had a client with 2 dependants over 17 as soon as I removed one of them the recovery rebate calculate credit for the second one (19 years), so I had to adjust it manually by multiplying $500 * # of dependant remaining.