Fixed last Null for now