Removed wrong hook, need to change this with the attribute system