Fixed #280

* The pointer is now used whereever appropriate in the ACP
Merge pull request #282 from frmwrk123/enhancement/280

Fixed #280