Added optional (missed that line when untangling).