Should fix scripts