fix for 2.4.3+