Fix for regex constraints