Fix for pointers on structs