Controller workaround