Fix ACP locking