Better fdo detection