External interface fix