Allow D2 common to handle this