SP-450 - Fixing regression in regex eval