Demo fix, to make it more ComponentStore acceptable