Fixed #280

* The pointer is now used whereever appropriate in the ACP