fixed some unfixed fixes, again ¬¬