Removed automatic host input classification -- and bug fixed