Bug fix for Struct + MemoryModule update