fixed setup fn