Fix build problem (cycle dependency)