Hopefully fixed pointer passing problem (With help of Joe).