fixed previous setup