Improvements on reset issue, not fully resolved.