merge oops fix from 2.2