V3.1hotfix