Fixed reset issue