Fixes premature initialization