Fix for 5.4