Fixed main section command ordering