Fixing shit again