Attempting to fix NaNs