trying to fix a 5.4 change