FIXED: correct for some uninitialised variables.