fixed the problem with the single-fd approach