Fixed script a touch more