Another attempt to fix script breaking