Fix governor issue