Fixed External Controls issue #9.