Fixed CF/Doctor