This could cause crasher too.

Change-Id: I47d9ad36937bf07cd0b79fa5eec7710ce84ce4a9