Fix issue with current store code