better reset support

Change-Id: Ibfa9d828d91c017b4509a6059060a7a44291aa67