Corrected parsing of NDP devices