Shell/2494

endlessm/eos-shell#2494