Fixed return list