Shell/2785

endlessm/eos-shell#2785