Fixing list usage