Shell/3769

endlessm/eos-shell#3769