this method never use to return null before, is this safe?