updated parsing to match old behavior