v1.2.5 Hotfix