Bugfix for struct format