Fixed buggy setup