Improve #737 command source behavior