fix repeatable problems