Fix due on 3.1 branch