finally fixing this