Store and Delegation quick fix