Fix for webhooks