BS-8936
Fix how command parameter should be handled in e4 (not the same as e3)