[BUGFIX] Follow up for hotfix