some fix for 5.4.2