sandra fixes