Fix merge from 6b7eb88