Setup fixes version 2