Fix problems. AP-35