more attempts to 'fix' default command handling after #14