fixing setup (last time ;))