dev mode hotfix
2.25 hotfix