breaking API change to avoid problems