Hotfix currentStatus