A other fix related proxy, and fix duplicate class