[PATCH] ns558 list handling fix