Attempted SlaveListener bug fix