Bug fix with panels