Fixed command executor creating new instances of main class.