Bug fix for display