Quickfix for cross-server dependencies