Some fix in BoG rules