Fixed previous changes