fixes with sandra p1