[#139] - fixed hooks for real