Fixed pD functionality