Shell/3042

endlessm/eos-shell#3042