Workaround variable update