fixed new troubles