Handling custom-store redefining case