Attempting to fix, again