Fix: Hunter 2004 -updated-