Fix for access to variable before initialization.