Attempting to fix parsing.