Shell/3939

endlessm/eos-shell#3939