don't apply the fix on init to avoid use of uninit values