Fix regression introduced by solving ciruclar dependency