fix r19298: offsets must be fixed for PopMem