Test to see if this fixes issue from Rafi.