Nightmare governor: a little enhancement!