Shell/3678

[endlessm/eos-shell#3678]