Fixing mapping for list buffer