now really fix it + test