doesn't go into infinite loop during setup now