BUGFIX: Uninitialized variables