tweek for 5.4