Update to work with 2.4