This is a possible breakage and would need a test...