Fix ACP in specific server configurations.
Merge pull request #231 from l0ud/acp-fix

ACP fix