seems to work again, need more testing