Upgrade to 1.509.4 minimum