another attempt at fixing this