Initial fix for pointer arithmetic