attempts at fixing (?)