Fixed needing a workaround client