Issue #31 fix additional wrong class references with defaultHandlers.