fix to hang in CSD parsing.