fix FIX_PTR macro so it actually fixes every pointer (was skipping x == current case)