Trying to avoid a parsing bug