Partial discovery fix