update to 2.4 compatibility