Fixed map issues with SCRIPT object