Update for work with 2.4