Fix to bad branch merge