masha's fixes1