This should be in a transaction too.