Fix for lists