small bugfix for struct unpacking