Fixed the reset that broke in the merge also