0.3 attempt to fix regex