Fixing for previous conflict

Updating again to Olivier's latest changes to the panel function