Multi-site integration bugfix