Another fix where vardiff was breaking things