Shell/2469

endlessm/eos-shell#2469