merge fix

I think this should fix the previous merge.