Fix from previous commit due to script hierarcy