Workaround circular dependency problem