Fix reset issue