Bug fix for context list