Fixed setup stuff, last version didn't work in practice