Fix previous changes