Minor fix + new hook