HOTFIX FOR ERRORS IN SHIT