Memory store fix