That solution is still too general as it will modify the behavior of the submission table.