fix validation interception