Fixing order of operations issue
Merge pull request #1 from nbroslawsky/master

Order of operations issue in memory store