Fixing the init state with no null values