Shell/4043

[endlessm/eos-shell#4043]