Allow better compatibility with PD