04/11/2022 - Script Fix