fixed previous changes