fixed hooks for consistency