Fix for uninitialised variables