Fix bug with hooks and topics