Fix circular dependency [hack]