Fix Safe/index argument