fixed missing return when no data