Shell/3677

[endlessm/eos-shell#3677]