Fixed the stores for 1.6.1