FIX: Possible uninitialised variables