Fixed controls not resetting correctly