another try at fixing this