Solve parsing of edict2 for edge cases