Fixed add goals