Bug fix GOV again