Fixed findstore issue