fix bug table and validation