Shell/4234

endlessm/eos-shell#4234