Shell/3490

endlessm/eos-shell#3490