Add buggy legacy client workaround