fixed some fuckup