Fixed compatibility with Sh

Change-Id: I077d59f2a864ee8ccace72c35019be17680b8267