Patched v3.11.0 with Surface