bugfix: struct validation completed