fix goal_wp modify outside of lock