Fixed bugs in FPStore