fix handling of different stores