Fix for Hitch