Fixes empty list issue