Also do it here, although may be removed soon.