fix goal tracking