Fixed components not resetting correctly