fixing latest changes