started fixing
seems working ok