First fix to tesoro mod