Fixed store controller bug