Change commander, fixed #30