fixed some hooks