Fix Versal/versal.com#2710

Versal/versal.com#2710