Fix crash on goal