Bug fix GOV