Fixed for commander 2.2.0