Form serialization enhancement, issue 1351, thanks Alan