Version 7 remove commander issue loop