And... yet another adjustment to the dereferencing process