make it work with 2.3