Fix checking for user defined LDs and PDs