0.4 attempt to fix regex