be compatible with Pd < 0.46