fixing more stupid fucking shit