Fix for 3.0-3.2+ upgrade issue.