hotfix still needed due to invalid data