[HOTFIX] Fix #823