Fix bug in struct/Store