fix incorrect merge in 9d40250