Fixed latest changes