another addr of pointer error :-(
Revert "another addr of pointer error :-("

This reverts commit 7b8315944955dca4067dbc7e0ecd5226b0112664.