fixup circular dependency

This might not be the correct way to fix this, but this is what I did to get it working.