Fix FORGE-1735 - List of Commands sometimes shows up empty.