Plug6 fix