fix for 5.4