Shell/3907

[endlessm/eos-shell#3907]