Fix the handling of do on commands
#3969
+675
−128
Merged
do on commands
#3969