make it work with 2.3, 3rd try