Workaround static updates