Fixed Pointers

Thanks Andy