Yet another attempt to fix the scripts