Data storing fix in regards to issue #160