more attempts at fixing