Really fix formparser