Fix issue #187 where geard freeze after subsequent stop/start