Critical: fix to avoid double initialization