VID-1412 Ugh, get this right; this hook should be here