final hook fix