S000: fine tuning

Change-Id: Ifd886009f5119fe2ea1a2230ca276b66237d02a5