Hooks for 1.6