patch to get 2.3 to work