I will submit a PR over the weekend to fix this in commander...