From #462 (hotfix)